@@ -72,7 +72,7 @@ gem 'mysql2', '~> 0.3.16' |
||
72 | 72 |
gem 'multi_xml' |
73 | 73 |
gem 'nokogiri', '~> 1.6.1' |
74 | 74 |
gem 'omniauth' |
75 |
-gem 'rails' , '4.1.5' |
|
75 |
+gem 'rails' , '~> 4.1.7' |
|
76 | 76 |
gem 'rufus-scheduler', '~> 3.0.8', require: false |
77 | 77 |
gem 'sass-rails', '~> 4.0.0' |
78 | 78 |
gem 'select2-rails', '~> 3.5.4' |
@@ -12,27 +12,27 @@ GEM |
||
12 | 12 |
remote: https://rubygems.org/ |
13 | 13 |
specs: |
14 | 14 |
ace-rails-ap (2.0.1) |
15 |
- actionmailer (4.1.5) |
|
16 |
- actionpack (= 4.1.5) |
|
17 |
- actionview (= 4.1.5) |
|
18 |
- mail (~> 2.5.4) |
|
19 |
- actionpack (4.1.5) |
|
20 |
- actionview (= 4.1.5) |
|
21 |
- activesupport (= 4.1.5) |
|
15 |
+ actionmailer (4.1.7) |
|
16 |
+ actionpack (= 4.1.7) |
|
17 |
+ actionview (= 4.1.7) |
|
18 |
+ mail (~> 2.5, >= 2.5.4) |
|
19 |
+ actionpack (4.1.7) |
|
20 |
+ actionview (= 4.1.7) |
|
21 |
+ activesupport (= 4.1.7) |
|
22 | 22 |
rack (~> 1.5.2) |
23 | 23 |
rack-test (~> 0.6.2) |
24 |
- actionview (4.1.5) |
|
25 |
- activesupport (= 4.1.5) |
|
24 |
+ actionview (4.1.7) |
|
25 |
+ activesupport (= 4.1.7) |
|
26 | 26 |
builder (~> 3.1) |
27 | 27 |
erubis (~> 2.7.0) |
28 |
- activemodel (4.1.5) |
|
29 |
- activesupport (= 4.1.5) |
|
28 |
+ activemodel (4.1.7) |
|
29 |
+ activesupport (= 4.1.7) |
|
30 | 30 |
builder (~> 3.1) |
31 |
- activerecord (4.1.5) |
|
32 |
- activemodel (= 4.1.5) |
|
33 |
- activesupport (= 4.1.5) |
|
31 |
+ activerecord (4.1.7) |
|
32 |
+ activemodel (= 4.1.7) |
|
33 |
+ activesupport (= 4.1.7) |
|
34 | 34 |
arel (~> 5.0.0) |
35 |
- activesupport (4.1.5) |
|
35 |
+ activesupport (4.1.7) |
|
36 | 36 |
i18n (~> 0.6, >= 0.6.9) |
37 | 37 |
json (~> 1.7, >= 1.7.7) |
38 | 38 |
minitest (~> 5.1) |
@@ -264,24 +264,24 @@ GEM |
||
264 | 264 |
rack (1.5.2) |
265 | 265 |
rack-test (0.6.2) |
266 | 266 |
rack (>= 1.0) |
267 |
- rails (4.1.5) |
|
268 |
- actionmailer (= 4.1.5) |
|
269 |
- actionpack (= 4.1.5) |
|
270 |
- actionview (= 4.1.5) |
|
271 |
- activemodel (= 4.1.5) |
|
272 |
- activerecord (= 4.1.5) |
|
273 |
- activesupport (= 4.1.5) |
|
267 |
+ rails (4.1.7) |
|
268 |
+ actionmailer (= 4.1.7) |
|
269 |
+ actionpack (= 4.1.7) |
|
270 |
+ actionview (= 4.1.7) |
|
271 |
+ activemodel (= 4.1.7) |
|
272 |
+ activerecord (= 4.1.7) |
|
273 |
+ activesupport (= 4.1.7) |
|
274 | 274 |
bundler (>= 1.3.0, < 2.0) |
275 |
- railties (= 4.1.5) |
|
275 |
+ railties (= 4.1.7) |
|
276 | 276 |
sprockets-rails (~> 2.0) |
277 | 277 |
rails_12factor (0.0.2) |
278 | 278 |
rails_serve_static_assets |
279 | 279 |
rails_stdout_logging |
280 | 280 |
rails_serve_static_assets (0.0.2) |
281 | 281 |
rails_stdout_logging (0.0.3) |
282 |
- railties (4.1.5) |
|
283 |
- actionpack (= 4.1.5) |
|
284 |
- activesupport (= 4.1.5) |
|
282 |
+ railties (4.1.7) |
|
283 |
+ actionpack (= 4.1.7) |
|
284 |
+ activesupport (= 4.1.7) |
|
285 | 285 |
rake (>= 0.8.7) |
286 | 286 |
thor (>= 0.18.1, < 2.0) |
287 | 287 |
raindrops (0.13.0) |
@@ -496,7 +496,7 @@ DEPENDENCIES |
||
496 | 496 |
pry |
497 | 497 |
quiet_assets |
498 | 498 |
rack |
499 |
- rails (= 4.1.5) |
|
499 |
+ rails (~> 4.1.7) |
|
500 | 500 |
rails_12factor |
501 | 501 |
rr |
502 | 502 |
rspec (~> 3.0) |